From 64ee268d7128c9feac335ca5f93547e0c55f624f Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Tue, 15 Jul 2014 17:52:11 +0200 Subject: [PATCH] Adwaita: brighter depressed buttons --- gtk/resources/theme/Adwaita/_drawing.scss | 16 ++---- .../theme/Adwaita/gtk-contained-dark.css | 56 +++++++++---------- gtk/resources/theme/Adwaita/gtk-contained.css | 56 +++++++++---------- 3 files changed, 60 insertions(+), 68 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_drawing.scss b/gtk/resources/theme/Adwaita/_drawing.scss index 9f16bbf02f..01a81c21bf 100644 --- a/gtk/resources/theme/Adwaita/_drawing.scss +++ b/gtk/resources/theme/Adwaita/_drawing.scss @@ -177,20 +177,12 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on color: $tc; @if $c!=$bg_color {border-color: _border_color($c); } @else { border-color: $borders_color; } - @if $variant == 'light' { - background-image: linear-gradient(to bottom, - darken($c,15%), - darken($c,11%) 3%, - darken($c,10%)); - } - @else { - background-image: linear-gradient(to bottom, - darken($c,10%), - darken($c,5%) 3%); - } + background-image: linear-gradient(to bottom, + darken($c,9%), + darken($c,5%)); @include _button_text_shadow($tc,darken($c,10%)); $_outsets: if($noedge, none, $widget_edge); - @include _shadows(inset 0 2px 3px -1px transparentize(black,0.7),$_outsets); + @include _shadows(inset 0 2px 1px -2px transparentize(black,0.4),$_outsets); } @else if $t==insensitive { // diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 2a08b6349b..09e75dab1e 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -279,10 +279,10 @@ border-style: solid; color: #eeeeec; border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #212424, #2d3232 3%); + background-image: linear-gradient(to bottom, #232727, #2d3232); text-shadow: 0 -1px rgba(0, 0, 0, 0.89176); icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(238, 238, 236, 0.1); + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1); transition-duration: 50ms; } .button:backdrop { border-style: solid; @@ -399,10 +399,10 @@ border-style: solid; color: white; border-color: #0b1e33; - background-image: linear-gradient(to bottom, #184472, #1c5187 3%); + background-image: linear-gradient(to bottom, #194776, #1c5187); text-shadow: 0 -1px rgba(0, 0, 0, 0.78353); icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(238, 238, 236, 0.1); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1); } .button.suggested-action:backdrop { border-style: solid; color: white; @@ -446,10 +446,10 @@ border-style: solid; color: white; border-color: #5e0707; - background-image: linear-gradient(to bottom, #a60c0c, #bd0e0e 3%); + background-image: linear-gradient(to bottom, #aa0d0d, #bd0e0e); text-shadow: 0 -1px rgba(0, 0, 0, 0.72078); icon-shadow: 0 -1px rgba(0, 0, 0, 0.72078); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(238, 238, 236, 0.1); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1); } .button.destructive-action:backdrop { border-style: solid; color: white; @@ -503,10 +503,10 @@ border-style: solid; color: #eeeeec; border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #212424, #2d3232 3%); + background-image: linear-gradient(to bottom, #232727, #2d3232); text-shadow: 0 -1px rgba(0, 0, 0, 0.89176); icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .inline-toolbar GtkToolButton > .button:insensitive { border-style: solid; color: #939695; @@ -681,10 +681,10 @@ GtkColorButton.button { border-style: solid; color: #eeeeec; border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #212424, #2d3232 3%); + background-image: linear-gradient(to bottom, #232727, #2d3232); text-shadow: 0 -1px rgba(0, 0, 0, 0.89176); icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .spinbutton.vertical .button:first-child:hover { border-style: solid; color: #eeeeec; @@ -722,10 +722,10 @@ GtkColorButton.button { border-style: solid; color: #eeeeec; border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #212424, #2d3232 3%); + background-image: linear-gradient(to bottom, #232727, #2d3232); text-shadow: 0 -1px rgba(0, 0, 0, 0.89176); icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(238, 238, 236, 0.1); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1); } .spinbutton.vertical .button:last-child:hover { border-style: solid; color: #eeeeec; @@ -908,10 +908,10 @@ GtkComboBox { border-style: solid; color: white; border-color: #0b1e33; - background-image: linear-gradient(to bottom, #184472, #1c5187 3%); + background-image: linear-gradient(to bottom, #194776, #1c5187); text-shadow: 0 -1px rgba(0, 0, 0, 0.78353); icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .titlebar.selection-mode .button:insensitive, .header-bar.selection-mode .button:insensitive { border-style: solid; @@ -964,10 +964,10 @@ GtkComboBox { border-style: solid; color: #eeeeec; border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #212424, #2d3232 3%); + background-image: linear-gradient(to bottom, #232727, #2d3232); text-shadow: 0 -1px rgba(0, 0, 0, 0.89176); icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); border-color: #0f2b48; } .titlebar.selection-mode .button.suggested-action:insensitive, .header-bar.selection-mode .button.suggested-action:insensitive { @@ -1453,10 +1453,10 @@ GtkTreeView.view.progressbar { border-style: solid; color: #eeeeec; border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #212424, #2d3232 3%); + background-image: linear-gradient(to bottom, #232727, #2d3232); text-shadow: 0 -1px rgba(0, 0, 0, 0.89176); icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .notebook tab .button:backdrop { color: rgba(201, 203, 201, 0.3); border-color: transparent; } @@ -2552,10 +2552,10 @@ GtkCalendar { border-style: solid; color: #eeeeec; border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #212424, #2d3232 3%); + background-image: linear-gradient(to bottom, #232727, #2d3232); text-shadow: 0 -1px rgba(0, 0, 0, 0.89176); icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .message-dialog.csd .dialog-action-area .button:insensitive { border-style: solid; color: #939695; @@ -2599,10 +2599,10 @@ GtkCalendar { border-style: solid; color: white; border-color: #0b1e33; - background-image: linear-gradient(to bottom, #184472, #1c5187 3%); + background-image: linear-gradient(to bottom, #194776, #1c5187); text-shadow: 0 -1px rgba(0, 0, 0, 0.78353); icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop { border-style: solid; color: white; @@ -2646,10 +2646,10 @@ GtkCalendar { border-style: solid; color: white; border-color: #5e0707; - background-image: linear-gradient(to bottom, #a60c0c, #bd0e0e 3%); + background-image: linear-gradient(to bottom, #aa0d0d, #bd0e0e); text-shadow: 0 -1px rgba(0, 0, 0, 0.72078); icon-shadow: 0 -1px rgba(0, 0, 0, 0.72078); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop { border-style: solid; color: white; @@ -2771,10 +2771,10 @@ GtkInfoBar { border-style: solid; color: white; border-color: #0b1e33; - background-image: linear-gradient(to bottom, #184472, #1c5187 3%); + background-image: linear-gradient(to bottom, #194776, #1c5187); text-shadow: 0 -1px rgba(0, 0, 0, 0.78353); icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .info .button:insensitive, .question .button:insensitive, .warning .button:insensitive, @@ -2933,10 +2933,10 @@ GtkVolumeButton.button { border-style: solid; color: #eeeeec; border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #212424, #2d3232 3%); + background-image: linear-gradient(to bottom, #232727, #2d3232); text-shadow: 0 -1px rgba(0, 0, 0, 0.89176); icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(238, 238, 236, 0.1); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1); } .button.titlebutton:backdrop { border-style: solid; color: #c9cbc9; diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 3a8e1b7f3f..7db54bf735 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -271,10 +271,10 @@ border-style: solid; color: #2e3436; border-color: #a1a1a1; - background-image: linear-gradient(to bottom, #c7c7c7, #d1d1d1 3%, lightgray); + background-image: linear-gradient(to bottom, #d6d6d6, #e0e0e0); text-shadow: 0 1px rgba(255, 255, 255, 0.76923); icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px white; + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; transition-duration: 50ms; } .button:backdrop { border-style: solid; @@ -391,10 +391,10 @@ border-style: solid; color: white; border-color: #1c5187; - background-image: linear-gradient(to bottom, #256ab1, #2974c2 3%, #2a76c6); + background-image: linear-gradient(to bottom, #2b79cb, #3583d5); text-shadow: 0 -1px rgba(0, 0, 0, 0.62353); icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px white; } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; } .button.suggested-action:backdrop { border-style: solid; color: white; @@ -438,10 +438,10 @@ border-style: solid; color: white; border-color: #8e0b0b; - background-image: linear-gradient(to bottom, #bd0e0e, #d01010 3%, #d51010); + background-image: linear-gradient(to bottom, #da1010, #ed1212); text-shadow: 0 -1px rgba(0, 0, 0, 0.64078); icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px white; } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; } .button.destructive-action:backdrop { border-style: solid; color: white; @@ -495,10 +495,10 @@ border-style: solid; color: #2e3436; border-color: #a1a1a1; - background-image: linear-gradient(to bottom, #c7c7c7, #d1d1d1 3%, lightgray); + background-image: linear-gradient(to bottom, #d6d6d6, #e0e0e0); text-shadow: 0 1px rgba(255, 255, 255, 0.76923); icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .inline-toolbar GtkToolButton > .button:insensitive { border-style: solid; color: #8d9091; @@ -673,10 +673,10 @@ GtkColorButton.button { border-style: solid; color: #2e3436; border-color: #a1a1a1; - background-image: linear-gradient(to bottom, #c7c7c7, #d1d1d1 3%, lightgray); + background-image: linear-gradient(to bottom, #d6d6d6, #e0e0e0); text-shadow: 0 1px rgba(255, 255, 255, 0.76923); icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .spinbutton.vertical .button:first-child:hover { border-style: solid; color: #2e3436; @@ -714,10 +714,10 @@ GtkColorButton.button { border-style: solid; color: #2e3436; border-color: #a1a1a1; - background-image: linear-gradient(to bottom, #c7c7c7, #d1d1d1 3%, lightgray); + background-image: linear-gradient(to bottom, #d6d6d6, #e0e0e0); text-shadow: 0 1px rgba(255, 255, 255, 0.76923); icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px white; } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; } .spinbutton.vertical .button:last-child:hover { border-style: solid; color: #2e3436; @@ -900,10 +900,10 @@ GtkComboBox { border-style: solid; color: white; border-color: #1c5187; - background-image: linear-gradient(to bottom, #256ab1, #2974c2 3%, #2a76c6); + background-image: linear-gradient(to bottom, #2b79cb, #3583d5); text-shadow: 0 -1px rgba(0, 0, 0, 0.62353); icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .titlebar.selection-mode .button:insensitive, .header-bar.selection-mode .button:insensitive { border-style: solid; @@ -956,10 +956,10 @@ GtkComboBox { border-style: solid; color: #2e3436; border-color: #a1a1a1; - background-image: linear-gradient(to bottom, #c7c7c7, #d1d1d1 3%, lightgray); + background-image: linear-gradient(to bottom, #d6d6d6, #e0e0e0); text-shadow: 0 1px rgba(255, 255, 255, 0.76923); icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); border-color: #184472; } .titlebar.selection-mode .button.suggested-action:insensitive, .header-bar.selection-mode .button.suggested-action:insensitive { @@ -1446,10 +1446,10 @@ GtkTreeView.view.progressbar { border-style: solid; color: #2e3436; border-color: #a1a1a1; - background-image: linear-gradient(to bottom, #c7c7c7, #d1d1d1 3%, lightgray); + background-image: linear-gradient(to bottom, #d6d6d6, #e0e0e0); text-shadow: 0 1px rgba(255, 255, 255, 0.76923); icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .notebook tab .button:backdrop { color: rgba(84, 89, 90, 0.3); border-color: transparent; } @@ -2544,10 +2544,10 @@ GtkCalendar { border-style: solid; color: #2e3436; border-color: #a1a1a1; - background-image: linear-gradient(to bottom, #c7c7c7, #d1d1d1 3%, lightgray); + background-image: linear-gradient(to bottom, #d6d6d6, #e0e0e0); text-shadow: 0 1px rgba(255, 255, 255, 0.76923); icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .message-dialog.csd .dialog-action-area .button:insensitive { border-style: solid; color: #8d9091; @@ -2591,10 +2591,10 @@ GtkCalendar { border-style: solid; color: white; border-color: #1c5187; - background-image: linear-gradient(to bottom, #256ab1, #2974c2 3%, #2a76c6); + background-image: linear-gradient(to bottom, #2b79cb, #3583d5); text-shadow: 0 -1px rgba(0, 0, 0, 0.62353); icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop { border-style: solid; color: white; @@ -2638,10 +2638,10 @@ GtkCalendar { border-style: solid; color: white; border-color: #8e0b0b; - background-image: linear-gradient(to bottom, #bd0e0e, #d01010 3%, #d51010); + background-image: linear-gradient(to bottom, #da1010, #ed1212); text-shadow: 0 -1px rgba(0, 0, 0, 0.64078); icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop { border-style: solid; color: white; @@ -2763,10 +2763,10 @@ GtkInfoBar { border-style: solid; color: white; border-color: #1c5187; - background-image: linear-gradient(to bottom, #256ab1, #2974c2 3%, #2a76c6); + background-image: linear-gradient(to bottom, #2b79cb, #3583d5); text-shadow: 0 -1px rgba(0, 0, 0, 0.62353); icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } .info .button:insensitive, .question .button:insensitive, .warning .button:insensitive, @@ -2925,10 +2925,10 @@ GtkVolumeButton.button { border-style: solid; color: #2e3436; border-color: #a1a1a1; - background-image: linear-gradient(to bottom, #c7c7c7, #d1d1d1 3%, lightgray); + background-image: linear-gradient(to bottom, #d6d6d6, #e0e0e0); text-shadow: 0 1px rgba(255, 255, 255, 0.76923); icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px white; } + box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; } .button.titlebutton:backdrop { border-style: solid; color: #54595a; -- 2.30.2